slight tweak
Some more tweaks I forgot to submit on Friday