Tweaked to be consistent with session scripts