remove state checking. Grr.