fixed it even more