Added some stuff back in that dissapeared during the merge