minor updates for speed