Updated to latest foundation plus new structure