optimizing some more