Updating base code