got rid of unnecessary overrides