This is the part of prev commit.