some stuff was changed