Feature/swap reduction 862