Added enabled check @ updatebounds and updatecost