Changed: Run function immediately after define