select has also to be changed