Changed back to using constants