fixing it all