Zara work

pull request for merge zara_work with master