took out testing hooks