catching soln up with bugfix