changed objective functions so that objects being stored and moved around are taken into account