added connells stuff but immediately commented it out