add some stuff for Haste (continued)