Updated with savequeuing v.1.2.0