Fixing it all up.