Changes ZAP- 2

on going changes