Fixed bugs

We are currently receiving the correct output