Made scripting choices a little less confusing