revert some little refactoring and show what method takes long to run