fixing issues from last week