updated some data access layer,