Updated from meeting on 8/11/14