Made optional really optional.