Simplified selection process, and made minor changes