add some of my own stuff