Update to base and variables