Implemented buggy version of Entity selection