Change waiting / error behavior
Update caress