Made some changes to get Foundation incorporated