Added commits and change some method names