Fix20

added some changes