Updated to the outstanding issues