More code movement