added more tricks