Merge ben's changes