added stuff from quickstat. modified for better fit

---