Updated to include more details