More optimizing changes..