Updating runtime (still way incomplete)