implemented 2 more problems