Couple of tweaks, more coming in the future