everything almost working for beta-?