This method should be moved below the existing one to minimize the diff