fixing it all up