another iteration of improvement

another iteration of improvements