Merge ridoo's changes