Updating: improving s2exp_app