updated with new vars for gui