working constants
merge conflict