final changes for pic handler