updated for OWRF 0.9b