hope i fixed the problems