Last logic tweak