Updated base code