Some more 2b
Some changes