Readded stuff, commented it out