updates as per client feedback