improve swtrunk