added new swapper by satyam as events was not handling properly