merge from STAWIS_Main