A little tweak here and there