updated for pictures and extra