Minor adjustments as we were playing around