Small tweek merge