Removed/added some stuff