Preparing for v2, complete remake