Oren: wow this is a better mod