Changed some stuff for clarity