second modification

data access logic