changes also for runtime