removed ability to wait, was causing problems