Changed a lot, for example to remove a bunch of constant polling