Updated using tap and removed pan