fixed it all up