Added ideas from talking with yong
Another issue to investigate