implemented comments from cableman