Is there any way to combine state 1 and 2 together? Maybe put some conditions on the add button instead of having them as part of the transition between state 1 and 2?