Added RAF support and delta fix.