Tweaked behaviour more to my liking