changing structure so that hopefully the whole package gets wrapped up