updated process + cleanup