added drive swap feature, changed delay time