Updated with additional information