fixed it all!