first commit about setting activity