Changed some stuff for work