Fixing it up for y'all