Changed some stuff :p