Pledge added, minor changes to Bug0