merged lee's file with free's updates