some changes added to superclass