Learnt about block.super, refactor accordingly