Added Draft of ZAP