added some tricks