Small tweaking