updated with all data