Changes

ticket taken from TNH
ticket taken from TNH
117

edits