changing structure to allow for more testing