Added the list trick for speeding the things up