Upating with today's changes. Hope this works.