Added manual selection