Feature/650 question