Feature/bedwards/three 873