Added "return false" for beta