updated from hack day later bits