Removing part of the instance system to handle all in a single bag
minor change