almost done fixing one last thing in the last else