about to make some optimization changes