new version which works with orawls