changes in constants to improve performance...