changes as discussed with ashish