Third Commit - made some stupid changes