Updated to add more info