changes to profile interface
fixed merge
added profile