Fix transitions
Extend on - recognize holders