more change, shoulfd be done except for colours