renamed some methods. issue #3