made some changes im sleeping by now