Removed things, added things

Thanks const_