Latest modifications before handing in