added some rinari support