now with enum...