updated code as per client req