change method invocations for easier overriding