Bouncy Castle Update

More towards the Bouncy Castle update.