updated comments. still need clientActivity comemnt