added RP and OSF