full integration of previous feature