p1253-1246 added/updated