Final touches to first version 3