minor changes, still not funcitonal