Controller's code repetition cleanup
Merge ../x0y0
Controller's cleanup