Added the managment for the first and second assignment