more updates for 611