Tweaked option endpoint again