finally fixed it all