Changed for new override