Implemented a 300% faster source