corrected issues from previous assignment