need to add objects to proper place