Better update loop?