catching soln up to changes in master