Some changes (24/25)

Some changes