changes to support increased performance