Switched to tzeva adom api
Some dirty fix