[orange.ly] Complete revision 1