Just a few tweaks from tommy