added ess loading
fix merge