Update to reflect work done on 9/16/14