C 7/25
C added issues