pimp 1.5.4 / 1.4.4 additions