removed while1