Updated base mechanics