Revert "Revert "modified for BlueJ use.""

This reverts commit 48a7473546ad388bfb849f074337eab798583a20.