Changed to incorporate foundation 4