more improvaments to make it work better

i guess this is not completed PR, i don't see where you're going to use this constant