moved traits around