Made some control shifts as per Weinberg's suggestions