Additional changes. Fiddling with code to have multiple objects