added to standalone client section