restructured, added flag for pcl16