Assignment #2 && update Assignment #1

i cant accept the PR until this gets resolved unfortunately :-(