updated for hw08