updated current changes to logged in

not completed but updated