working on rounds working
manual merge