Added two states to help with stopping