Added zapping part 2