Reorganized, added second assignment