Updated code to work with r18115