database updates as per requirements from 28/6