a little more optimizing, or something