Final touches to first version 2