added short circuit and ssa