Adding less and a couple of tweaks