Worked on code a bit