Resolved some problems
Resolved some problems