Fixed SWAT with guickpick