Second changes (17/29)

Second changes