Modified state definitions, added eval board FM