Revision 2.0 - Changing logging system