use new style enum
use new style enum
set stages properly add status stage