Changes using def_sts() instead of const()