#37 : Many changes to Picture