Code changes for my last commit. I didn't commit properly last time