Revising with changes from splk.org and for sandy site.