cleaned up swp