Assignment 6 refined even more