Work for - OCLM-2

Please review this and advice
same as above