Features/issue 356

Adding updates per notes.