Modified to use _super (+ test cases)