add trying to optimize
merge changes form signed branch and removed way check