added overrides for clarity
small changes