Cleaning up problems 4 and 5