Tweaking borders and using more variables