Squirrly / improve productivity

improve productivity