data access fix.
refactering