updated for berkshelf 3