adding back checks for existing data