Move this to a private method as well?