Revision 1.7 (unstable)