fixing this problem, finishing it