Feature/hw 2