Final version before adding Foundation.