More work on R side