added the rest of the last commit (I dun goofed>