Resurfacing this was fighting bugs