use enum more correctly
use enum more correctly