Isn't there any logic duplication with changes above?