Updated software
final changes