Commit based on feedback

Commit based on feedback and trying to find possible erroe (also used
file from trunk to try to make it even as it looked like it was gonna to
be the source of a merge conflict later)