added profile controller
added profile controller
fixed merging problems