some chaanges