fixed (maybe) the problems after merging. Tester doesn't pass..