Added short circuit and other vars where they were not before