initial import of 0.6