Solved more problmes