Updated version of Dolpin Assignment