replaced hardcoded values with enumerated values