merge and fix xondemand