Changed way to handle profile