changed the way we are doing subs
merged in player file.  I made changes and so did you, so needed to merge