Changed some stuff (too lazy to commit each atm)