cosmeticand logic changes