updating master with homework 3