Second assignment, upgraded