initial import of v05 code