added waiting state back in