WIP: upsampling takes a long time
WIP: still too slow