Latest updates from Paul's fork