Merged from GUI, new reserve option