First version of zap
Final version of zap