Added ability to go back and forth