revival: sort of works now