Added calibre and package update