update 2  final

work in progress