Start of redesign
Removed transitions