Version 1.3 using constants