Changes need after commit 6426e85