*more changes on clientSource