changes to be compatible with modified temporary storage