Now works with recent changes