removed duration; removed diff method; upgraded version