upgrade state and kiosk fix