Procedural enhancements to the comp sys