Not sure this method needs to be public