changed problems according to the comments