Tried to be more memory efficient... but still too big