Completing the previous commit since some changes did not get included