Updated to latest foundation