*8995* Make submission steps more flexible