fixed exi and supposedly reduced computational overhead