v1.20 added

Some improvements