Integrating all of the 2.5 work in to personal Master