Updated override