Working on Malins change-requests