Latest changes to the code