Fixed previous commit to include proper session saver.