Added changes from checkin