Given new layout for possible better performance

Hopefully this will be better than the layout I was going to have.