Implemented feedback from @abh