Added UEO feature