Safety commit, before I delete some loop stuff