Re-added stuff that someone deleted