Redesigning tag stuff following FSM guidelines