Patched from project 1 changes