updated variable organization