Completed profile switch as requested #70