Revise #programming flow