Refactored another method, removing virtual where it shouldn't be used