Added changes from mbliss5