Update with profile functionality
fixed merge conflicts
before merge