Some more moved code...