Fixed incorrect number of args. Fixed unused method for overriden methods