Reworked.

 - Backwords compatible. (Passes suite)