Modifications needed by handins