added todo for activity timeout