fixed the "difficulty" mess Patrick got us into