Some changes, but not new version

TUS login needs fix by MI!