REMOVED OLD COMMENTS, no real code changes