Tweaking previous commits following a bit more testing