Added future proof o8c