added tank and cleaned up