updated to latest foundation library
merged changes