Working on Feedback

Attempt to make it more performant from comments