Updated variable defaults and conditions