1 more tweak for optional