Version 3 updated

More fixes