srtup and usersetup

srtup and usersetup update