Minor Changes part 2