Suwako: even more tweaking