So with the recent leaks, i guess we can conclude this discussion with:

Its both.

Congratulations, these 24 pages were literaly pointless, whod have thunk it