Updated to include latest info