some cachange in cod style