Updated Mode and Code