Update to better fit some things...