added new swapper and zeview