changed pic handling