Continued work on the code