Final changes before interactivity!