initial import, corrected