updated May 9, 6:02pm PST based on dev feedback for touch more gas savings.