improve zone changes further