Neaten up this method. Check that if there is only one