Changes as per author suggestion