change for new spinner systeme