And final tweak for it to work nicely