Made sde more universal