-Attempt to handle attribute selection better