Use INTRINSIC_ constants instead of plain numbers