moved logic tweaked