Second changes (20/29)

Second changes