Updated with user requested changes.