once again change the handling of instances