CDB-2077 modified from 50k to 25k and removal of unneeded constant