updated for 5.3 and bpt usage