fixed it almsot totally