major structural change. Hope this works!