removing debug and adding the rest of the properties in