Making the previous commit to actually work + Constant reevaluation fixed