Tweaks for my own flavor