switched to package constants instead of numbers