A few additions and changes