added noAutoFinish functionallity