Changes to blocking code (for now).