added satuff by master