Resovled some problems