Replacing code with 0.18.3 version