Assignment #2 && update Assignment #1