Working version 2

Many updates.