"modified some stuff for fixing"