window state management amended
dataManager amended