V2

Updated to make more efficient and add lazy-loading