FIXED managing application state