More updates for OI hipster.