made some changes that hopefuly helped
bug still here