Added Crudux Cruo's changes and additions.