Made changes as per email sent on Mar 14th