Picture Extensions improvement