Test
More optimization
Minor refactor
oops