revised some stuff