Merge over Lucas' changes