A few teweaks