Tinkering to make swep work