Rvidi 36

Please review this.