made some of my own personal modifications