r3

Some changes