Final touches to first version 6