Beta_2

Some changes...