MANUAL Merge w. Michael's Changes. CURRENT FINAL