Updates per requests on 3-2-2014