more changes as per client request