adjust for optionals