added more sw