solved some problems
solved some problems