Added more state change events to propperly transition.