Changed references to my own