works! version ready for columbia testing