Fixing it up!