I have split these into two methods