added some more adjustment