Major bswpm revamp