maintain selection
added hijacked version