update some junk to get this working iwth altamirabundle