Revision 3

So many design flaws...