Partial modification on Baf methods.
Final version