refine after watch solution