I added more stuff
Combined Richard L's changes