updated DATA BASED