Reference selection improved