Merge Lucas changes