Massive Revision upgrade