Updated with memory workspace