Start optimize
Bug fix and comments