Minor updates, adds version 2