solved 2 more problem