apply changes from 2014-03-20