minimal changes for UI and script