Updates + add switche, for, etc.