minor changes
ifdefed TEST