Made selection tool better