start fixing normal state