Rearranging things to make CloudPebble happy