First draft of the SWAT upgrade