Changed some stuff :P