updated based on user tetsing responses. refs item:819