Applied changes from PR