Added more tricks