fixed beta
merged samitha stuff