Added some of my own work