Adding loop and save options