Almost ready tweaks