work on the code