Updated Steve Corona and Bruce Wong's proposals