Adding some things back... They should not be removed again