refactored user and local data