sped up a few methods in State