fixed it a bit