Added a couple side benefits