fixed state transistions for a2
merged state changes into master