Revise handle of yellow and red strikes, reorg