Added changes from meeting on 5/6/14