changes in POC_v4 branch