Should make the BP stuff a bit better