merge in all the profile code