Some changes (17/25)

Some changes