Rework; it's working again