replaced single numbers with enums