more updates from Local