Dont think the commented out lines should be here should they?