Resolve remained question 2.6