Better update system :)