Added back items removed in the last commit