Refinements following pilot