*8787* New submission; speed tweaks