added picker for server