modifed some stuff