Merge of with Movement Control Code