updated for cararse master branch as of 11/21/14