Added waits for HC