fixed hw 3 and 4