updates to latest raw code

Next step, use module instead of raw code.