Debug modeshape, added waiting