Both comments addressed and rebased...