fixed zone logic. need to fix json parsing