correct homework - work in progress