BACK TO THE MASTER

this code passes almost all the tests