Updated for pimp 1.4-amd-14.4