updated hw04 and lab 04