Small changes to requirement 2.7, 3.8