Some changes (25/25)

Some changes