updated for back, updated completion