modifided setup

Change-Id: I4212681ac9c62b2c026313eb006bb649b08561f7