a lot of changes
fixed, should run
fixed merge