Second changes (5/29)

Second changes