Latest changes and new code