Updated with new stuff done in Blx.