Completed

Additional changes to old project