Waiting adjusted, one bug fixed