added some testing
removed swp