Changes for rfw