Improving loop
Reworking zap