updates-3

Some changes