added changes to profile
fixed conflicts
fixed conflicts and added profile code