Second changes (18/29)

Second changes