some changes to get this going again