cycle 1 fixes