Half fixed the problem