Improvements from Alex ;d