modified some stuff