Removed and added stuff