fixed refactored method calls