minor updates for performance