now add back with updated optional