ripping out jwrapper, going back to previous solutions