house keeping
house keeping
add some more logic for enum task