Changes for pictures feature