Fixed commented out bits