Updated with complete information