fix bugs agian
great version