These lines should be added back