Rewritten some of the old java scenarios.