Recent changes attempting to recover functionality.