started to modify stuff