same changes for optik