Improved version of last Ravi release

As spoken during the skype call