beta1 - fixed errors