Add option to not reset