changed some method names
removed module dependency