Fixed an issue
Change of method names
Change of method names; removed some methods