P006-Pic SS changes