Added changes from MBA