prepare for full integration