Changed after second reviewing