Better notification and state handling.