Added hatch + cleanup