Optimizaed by removed unecessary shift