minor change, added symbolic constants for magic values