add check and select

@reinpk :)