Revision #2 of main project