Changes for Zap again