Feature/reset field