working revision 0.2