soloved some problems
soloved some problems