changes to include more info