Added changes from robinhouston