Fixing it all up