working on control
merge