Update 6.1

Bugfixxing