Changes 310513

picnic update