Also applying several refinements for brevity!!