fixed all the tricks