Modified the files as per Nancy Requests