Amnon - code changes