Derek's updated unit class