update for R15 compatability