updated to use new constants