Adding the overridden code form the previous commit..