removed duplication of inherited code