Added enc to more vars