Big changes: Work done, but still need some optimization