Don't slow with me option + refactor